Fix two syntax file issues #20
Conversation
maxzinkus
commented
Dec 2, 2019
maxzinkus
commented
- Nested comments, fixes Syntax highlighting is wrong for comments #17
- Module line, fixes module syntax line not correctly ended #19
Addresses #17 This may introduce some weird edge cases with nested comments. However, it preserves correct behavior for normal comments and fixes the case of nested comments in a similar way to vim's `c.vim` (using a dedicated region for line comments). As with `c.vim`, we shrug at the edge cases.
|
Hello Max, thanks for this. The first commit looks good to me and fixes an old problem. The second one introduces a slight problem though, module paths have their last character not highlighted: I was actually agreeing with your comment here #19 (comment), maybe like this? (remove the diff --git a/syntax/fstar.vim b/syntax/fstar.vim
index f01a3b1..2e607cd 100644
--- a/syntax/fstar.vim
+++ b/syntax/fstar.vim
@@ -114,8 +114,8 @@ syn region fstarNone matchgroup=fstarKeyword start="\<open\>" matchgroup=fstar
syn match fstarKeyword "\<include\>" skipwhite skipempty nextgroup=fstarModParam,fstarFullMod
" "module" - somewhat complicated stuff ;-)
-syn region fstarModule matchgroup=fstarKeyword start="\<module\>" matchgroup=fstarModule end="\<\u\(\w\|'\)*\>"me=e-1 contains=@fstarAllErrs,fstarComment,fstarCommentLine skipwhite skipempty nextgroup=fstarPreDef
-syn region fstarPreDef start="."me=e-1 matchgroup=fstarKeyword end="\l\|=\|)"me=e-1 contained contains=@fstarAllErrs,fstarComment,fstarCommentLine,fstarModParam,fstarModTypeRestr,fstarModTRWith nextgroup=fstarModPreRHS
+syn region fstarModule matchgroup=fstarKeyword start="\<module\>" matchgroup=fstarModule end="\<\u\(\w\|\.\)*\>" contains=@fstarAllErrs,fstarComment,fstarCommentLine skipwhite skipempty nextgroup=fstarPreDef
+syn region fstarPreDef start="[:print:]"me=e-1 matchgroup=fstarKeyword end="\l\|=\|)"me=e-1 contained contains=@fstarAllErrs,fstarComment,fstarCommentLine,fstarModParam,fstarModTypeRestr,fstarModTRWith nextgroup=fstarModPreRHS
syn region fstarModParam start="([^*]" end=")" contained contains=@fstarAENoParen,fstarModParam1,fstarVal
syn match fstarModParam1 "\<\u\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=fstarPreMPRestrThat said I'm pretty unfamiliar with these files, so take with a grain of salt. By the way, we are developing a VSCode extension for F*, so I doubt this repo will see much use. I however do have this installed for syntax highlighting, but I do not use the interactive mode. |
|
Ah! Irksome. If you want to snag that first commit in and omit the second, then that's totally fine by me. I've actually not looked at FStar with Vim in a while either 😅 Either way- thanks for following up! |
|
Thanks, I pushed your first commit, and my edit of the second mentioning you. |
